bitkeeper revision 1.1570 (4296dbcdhFdFajOGxHJCyEMvDA0TWg)

[PATCH] [PATCH] Missing start_vmx call

Start_vmx was removed by accident. This patch puts it back. start_vmx
is used to initialize the VMX subsystem, without it VMX operations result
in bad opcode traps and crash Xen.

Signed-Off-By: Leendert van Doorn <leendert@watson.ibm.com>

diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index 58826cb21de146fa04e0477eafcce4f8f1507dc3..861723719b178c1403340cb5b06497b1f9369ef8 100644 (file)
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -10,6 +10,7 @@
 #include <asm/mpspec.h>
 #include <asm/apic.h>
 #include <mach_apic.h>
+#include <asm/vmx_vmcs.h>
 
 #include "cpu.h"
 
@@ -162,6 +163,10 @@ static void __init init_intel(struct cpuinfo_x86 *c)
                set_bit(X86_FEATURE_P4, c->x86_capability);
        if (c->x86 == 6) 
                set_bit(X86_FEATURE_P3, c->x86_capability);
+
+#ifdef CONFIG_VMX
+       start_vmx();
+#endif
 }